From e97ae00801dc3041a43b78db237a8603ddc9b7b1 Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Wed, 24 Nov 2004 19:21:39 +0000 Subject: [PATCH] bitkeeper revision 1.1159.189.5 (41a4df43-1oRwflRup-Lv0_uV9XxdQ) sync w/ head. --- xen/arch/x86/x86_32/entry.S | 2 +- xen/common/dom_mem_ops.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 623e0961bb..ad6477f7a8 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -96,7 +96,7 @@ do_multicall: multicall_loop: pushl %ecx movl 4(%esp),%ecx # %ecx = struct domain - movl DOMAIN_processor(%ecx),%eax + movl EDOMAIN_processor(%ecx),%eax shl $6,%eax # sizeof(irq_cpustat) == 64 testl $~0,SYMBOL_NAME(irq_stat)(%eax,1) jnz multicall_preempt diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index cf5ade9025..521d1a1258 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -39,7 +39,7 @@ static long alloc_dom_mem(struct domain *d, __HYPERVISOR_dom_mem_op, 5, MEMOP_increase_reservation, &extent_list[i], nr_extents-i, extent_order, - (d == current) ? DOMID_SELF : d->id); + (d == current->domain) ? DOMID_SELF : d->id); if ( unlikely((page = alloc_domheap_pages(d, extent_order)) == NULL) ) { @@ -73,7 +73,7 @@ static long free_dom_mem(struct domain *d, __HYPERVISOR_dom_mem_op, 5, MEMOP_decrease_reservation, &extent_list[i], nr_extents-i, extent_order, - (d == current) ? DOMID_SELF : d->id); + (d == current->domain) ? DOMID_SELF : d->id); if ( unlikely(__get_user(mpfn, &extent_list[i]) != 0) ) return i; -- 2.30.2